Fix error when group id has colon

Change-Id: I872763c21e11e1fbdc035f0b5f6bc7568dd30d00
Merge "Fix error when group id has colon"