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

* commit '7ef7ef0e05736698d44876f3e51b841a2dac9be1':
  Add support for additional international keyboard mappings