Merge "Fix flaky ScheduleCalendarTest"
am: 08667cc9c1

Change-Id: If0c64d0a7b6f7a51f3a4d09b7ecf9cbad7ad6883