am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread

* commit '9f0a386e99785c092b90e0b40fe6bfcff3b74c8e':
  Salvage Broken ContactsTests