am 6e87cc11: am a2ab5875: am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread

* commit '6e87cc1143ff684611f75a22fd03f7721b10b8fa':
  Salvage Broken ContactsTests