Merge "1/2 Sync Contacts and GoogleContacts manifests" into mnc-dev