Merge "Controls management Minor polish changes" into rvc-dev am: 1a42c21099 am: 9da9e1c373

Change-Id: I3d7d5248811bb7ab11b3f4ec0de658012e4aace1