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

Original change: undetermined

Change-Id: Id7ba63748720f6b16ca10bfb90577397d57dd0d0