Return ContactsCommon to AOSP