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

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