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

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