am 8e244282: am 0f511622: Making contacts provider tests run again

Merge commit '8e24428214a50901cc1a43f785e6d824661bf210'

* commit '8e24428214a50901cc1a43f785e6d824661bf210':
  Making contacts provider tests run again