am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8e3f8d3af576648cc73181d3ba2a89c107dffc75':
  Import translations. DO NOT MERGE