Merge change 8594

* changes:
  Renaming ContactsContract.Contacts to ContactsContract.RawContacts