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