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

Change-Id: I46207da062057b76527fb00aa3fd0614bd6b1809