am 93c14d1d: am 4682cf02: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '93c14d1d468656d143292e4f5fdd2bdef2592e05':
  Import translations. DO NOT MERGE