am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '4df6c6292b9bfa35ece3c09d5094a7f4089c5029':
  Import translations. DO NOT MERGE