REVERT Add back hardware key settings.

Change-Id: I925fd9d9c02b86d8e93c8b9e25870433f7c20bde (reverted from commit 85e1cb8a5b982deed89921b292b8240fce23ec98)