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

Change-Id: I88eb23201ef2fc5cde78f0982b10fb01ef49819a