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

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