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