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

* commit '6a14146b379b33a6bf947f02b2550fa97c5619b6':
  Add support for additional international keyboard mappings