Reduce the number of columns for group queries

1~5% performance improvement. Also will improve memory usage.

Bug: 5550672
Change-Id: I5ad0876ce469fbf86334e3f77b15cd240d9f761b
4 files changed