Merge "Merge "Controls management Minor polish changes" into rvc-dev am: 1a42c210 am: 7204c64b" into rvc-d1-dev-plus-aosp