am 78f678db: Merge "Improve Contacts_PeopleTest" into ics-mr1

* commit '78f678dbf3a4dc85ef9ea33a8f4e785466309d88':
  Improve Contacts_PeopleTest