Merge "Fix group name layout" into rvc-dev am: d7d84c0b am: 70932b22 am:...
Merge "Fix group name layout" into rvc-dev am: d7d84c0b am: 70932b22 am: aa656070 am: 71f4b603
Original change: undetermined
Change-Id: I723ee2181538c028b3aa57d8911f218963ae1995