am 2e3f261d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2e3f261df8d4603ec485d8bb665a87edc93ca6c1':
  Import translations. DO NOT MERGE