Merge "Controls management Minor polish changes" into rvc-dev am: 1a42c21099 am: 7204c64b50

Change-Id: I4e0e8fc4af79072a8d886c8d19ead5fc1f51b846