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

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