Merge "Put _SYNC_LOCAL_ID into event entities"