Merge "Fix CalendarTest.test_clear_45877."