Merge "Gate controls controllers with system feature flag" into rvc-dev am: 0711557c68 am: 24cca715c8

Change-Id: I1b2aa49a9955101f56d73c8bd8cc7d2a7703c20c