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

Change-Id: Id969d9cd17a2e971e7cd32e818262910679300b4