Merge "Fix possible NPE on People" into ics-mr1