Merge "Gate controls controllers with system feature flag" into rvc-dev am: 0711557c68 am: e1fb787bb9 am: 0648e897c5
Change-Id: I9e896107f790f0bf8a9758463739ad4734f3f46a
This commit is contained in: