am fdbc8f37: am f4a3b7e5: Solving deadlock in ContactProvider2

Merge commit 'fdbc8f3785a4c097a086b2dcfbfcb2d1188cb331'

* commit 'fdbc8f3785a4c097a086b2dcfbfcb2d1188cb331':
  Solving deadlock in ContactProvider2