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

Change-Id: Ie3b2b5285ec120787443b79affbf0fab45db1315