am 9c2797cf: am 3684089a: ContactsProvider2 optimization: Performing name and email lookup entirely in the database

Merge commit '9c2797cfe7fc6f73fc901589f1332f1045b3a73b'

* commit '9c2797cfe7fc6f73fc901589f1332f1045b3a73b':
  ContactsProvider2 optimization: Performing name and email lookup entirely in the database