Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1
am: 97f1fa1688

Change-Id: I499a6152b42fb94deeeb88e1b90107f92eb4efa0