Fix group name fail

Change-Id: I2259036dd0826f724cb42cb67bbc6324b48d680a
Merge "Fix group name fail"