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

* commit '50a8911628a27fbbac678dd679aaafadceb65bee':
  Import translations. DO NOT MERGE