Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"