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

* commit '12e9bfd677895bee0d2b6f994e5f743d6df834fc':
  Import translations. DO NOT MERGE