Better coding for HW keys enable/disable feature

Change-Id: I23e79d711064af276bbccd5bc812f8a2aef8db13