Merge "Fix group name layout" into rvc-dev am: d7d84c0b7b am: ed21663517

Original change: undetermined

Change-Id: I4ef43054fafc60dc985a3edf33ee84bc44c7def1