am 9a75d6d8: Merge change I63646eb5 into eclair

Merge commit '9a75d6d827c7a9810e39d2abf9757862044a0714' into eclair-plus-aosp

* commit '9a75d6d827c7a9810e39d2abf9757862044a0714':
  Fixing ContactsProvider2 test breakage.