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

Change-Id: I27da067af2033e56d0087414f41869ebea4ed817