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

* commit '6bd881bd328835f9b042d859cb496ed6f612c17b':
  Import translations. DO NOT MERGE