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

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