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

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