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

* commit '5c4c1eac50ae86344c8f6a9cecf4e6fc436f3a21':
  Import translations. DO NOT MERGE