Fix Hardware Key bindings

Change-Id: Idab7e5cd348d162cd97df638b7cdac1cc897f09b