Merge change I63646eb5 into eclair

* changes:
  Fixing ContactsProvider2 test breakage.