am 706c6613: (-s ours) am 8b024af2: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '706c661348c6c904e6e9c22f2bbd996dfdd2b424':
  Import translations. DO NOT MERGE