Merge "Remove READ_WRITE_CONTACT_METADATA, which is no longer used" into nyc-dev