Merge "Use CONTACT_METADATA_SYNC_ENABLED." into nyc-dev am: b9082df14a
am: a6bba6bfa4

* commit 'a6bba6bfa4e5a7c087747c8cd436fd2eea741439':

Change-Id: I7a280a13bce23a5c43c7679b9b9c89acb1bba500