Merge "Fix overlap of text and star in controls" into rvc-dev am: 9b77b193...
Merge "Fix overlap of text and star in controls" into rvc-dev am: 9b77b193 am: 10e2e72d am: 9c7108b2 am: a02996b3 am: 7fe12a80
Change-Id: Ibb500de2560b7af8641a0971b30a062f5f2201a9