hardware keys rework (2/2)

Change-Id: I9b8cec714f98f1aeb531c91b34ffcb0636f0de9a