am 845da84a: (-s ours) DO NOT MERGE: Fix test crash in ContactsProvider2.initialize().

* commit '845da84a53856e31ac72dfe7d7983e5cb6560617':
  DO NOT MERGE: Fix test crash in ContactsProvider2.initialize().