Merge "Handle rename of _SYNC_LOCAL_ID to _SYNC_DATA in Calendar"