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

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