am a2535f33: Merge "Speed up query for group tab" into ics-mr1

* commit 'a2535f334849b4b16cef6dc55041a426ad57909a':
  Speed up query for group tab