am a27eb4c7: am 8fc77898: Fix keycode. [Cherry-pick from master]

Merge commit 'a27eb4c7d9e339e084bb2f7c0e7b4a60d0dbe925'

* commit 'a27eb4c7d9e339e084bb2f7c0e7b4a60d0dbe925':
  Fix keycode. [Cherry-pick from master]