am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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