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