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

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