Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev