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

* commit '4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
  Import translations. DO NOT MERGE