am 0c51de15: Prefer ContactsProvider over GoogleContactsProvider.

Merge commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79'

* commit '0c51de15fd3279f1c67d4b9834ebd7334fe82f79':
  Prefer ContactsProvider over GoogleContactsProvider.