Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11
am: 0533f91da7
am: 140b6479d0
am: 85fba9badb
Change-Id: I23345689712d784aac041d2e52af8a8a1dc24345
This commit is contained in: