Add back Hardware Key overlay

PS 2 : Cleanup

Change-Id: I314b88dbad2cb741239630f7a1529172c6bd5330