Merge "Fix NPEs during ContactsProvider2Test"