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