Merge "Fix issue with failing ContactsProviderTest."
am: c5b95938cd

Change-Id: Idefe89ca63dcd88173ced087c0d2609acc2d30b2