Merge "Remove GROUP_ID; not actively being used by apps." into qt-dev
am: 285f6ffff9

Change-Id: I6d7dd7a55d66998cf2de7f8ff09b9608bc5322f8