Merged r11128 from trunk to 2.2-stable.
Test fails when run at the beginning of the day.
Authored by: tmaruyama 2013-01-08
Parent: [r11140]
Child: [r11142]