[DO NOT MERGE] Clean up PeopleActivity in i-dev
am: de61df7b6a  -s ours

Change-Id: I99816cd97225720b968e18bf4270e9662a4cf92b