Merge "Fix test crash in ContactsProvider2.initialize()."