am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread

* commit '7d1fc75dfe7de96b2c13bb5215e1eeb7e4a7bea8':
  Fix Contacts_PeopleTest