Fix duplicate groups

Change-Id: I405b3150aab5a7ac06b70041e75ace632299c1d5