Merge "Merge "Fix group name layout" into rvc-dev am: d7d84c0b am:...
Merge "Merge "Fix group name layout" into rvc-dev am: d7d84c0b am: 70932b22 am: 115cdbf0" into rvc-qpr-dev-plus-aosp am: c6756342
Original change: undetermined
Change-Id: I0bbd2a98be5d9c59e3a57471ee699487a37cee10