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

* commit 'a6009edd6a039953e607d877007ab3e8cf0b7568':
  Import translations. DO NOT MERGE