Merge "Fix broken tests for CalendarProvider2"