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

Change-Id: I5673f6af0f261743e5b7a39c2cd0153770d01731