Merge "Fix issue with failing ContactsProviderTest."