am ae5a2a4a: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev

* commit 'ae5a2a4a4ef055fc0403b2cefa860b29ae88c998':
  Revert "Import translations. DO NOT MERGE"