Merge "Add Secure Setting for Controls" into rvc-dev am: 1f8d91de8c am: efe1971995 am: c298892124

Change-Id: I79a184d252a55aecb3f666552c2fd858e68e1d4b