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

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