ContactsCommon and Contacts to aosp