Hardware keys remapped mod

Change-Id: Ie4ea2cb5c1e4ae0d78e31091f095ac14c4e1bc42