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

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