Hardware keys remapped mod

Change-Id: I88a8ef71d507c776766246cf6d2c13365679b3c1