Merge "Fix group name layout" into rvc-dev am: d7d84c0b am: ed216635 am:...
Merge "Fix group name layout" into rvc-dev am: d7d84c0b am: ed216635 am: 56ffc0ac am: 05127bab
Original change: undetermined
Change-Id: I57716559b1d99996296247b9d001e6ae2d11cdbb