am ed87b51c: am 9a75d6d8: Merge change I63646eb5 into eclair

Merge commit 'ed87b51c9977cdbb2ebff658ad1e433b86ff01b8' into eclair-mr2-plus-aosp

* commit 'ed87b51c9977cdbb2ebff658ad1e433b86ff01b8':
  Fixing ContactsProvider2 test breakage.