fix hardware keymappings

Change-Id: Ic7191c782d1c6c34edda2a64a51b98f02ce23411