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

Original change: undetermined

Change-Id: I57716559b1d99996296247b9d001e6ae2d11cdbb