Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread