Merge changes from topic "controls_config" into rvc-dev am: 61d46be2c2 am: 10739665e3
Change-Id: I5d54e1ff16dcc31459d2fca3113a9ba053d8dde0
This commit is contained in:
61d46be2c2 am: 10739665e3
Change-Id: I5d54e1ff16dcc31459d2fca3113a9ba053d8dde0