Jf: Has Hardware Keys
Merge "Jf: Has Hardware Keys" into jb-mr2
Merge remote-tracking branch 'cm/jb-mr2' into jb-mr2