Add back support for hardware keys

Change-Id: Ide74bf49315f2c5112eebb5612a05df9ea4f6a99