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

* commit '8b024af2a4490e2e8c83955dd61b455e02921182':
  Import translations. DO NOT MERGE