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

Change-Id: I1d0002a9ee24e7571ca72ff62616c46ab53f8e11