s4-common: Don't assign garbage groups

Change-Id: Idbca017ef2eb2a2cf5fe85304f0d4591e09e4c09
Merge remote-tracking branch 'cm/cm-11.0' into HEAD