Merge "Fix CalendarSyncAdapterTests"