Merge "ContactsContract api changes"