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

* commit '707318795e478a9789860b5006c8ae388eeb9e12':
  Import translations. DO NOT MERGE