am 2cbec492: Merge "Make sure unmatched autenticator/account-types doesn\'t crash Contacts."

* commit '2cbec492d03e7b5db7b7a1d5277fc7264cac3241':
  Make sure unmatched autenticator/account-types doesn't crash Contacts.