Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: bb87fb6954 am: 31c4bfd74f am: 39d67d5b71 am: 161ccc84b6
Change-Id: I3297c7e07d04da295ab3fb5304773fb92602dbed
This commit is contained in: