am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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