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

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