More keymap refinements

Change-Id: If3ae6ece7848b143088d5f9ec8c00ed593d59ed2
2 files changed