am c9b937bb: am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"

* commit 'c9b937bbfae825e32158e06ca52f320ca3d6f464':
  Add support for additional international keyboard mappings