Merge "Reduce a column for People contacts query" into ics-mr1