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

* commit '342bb26b0d06ded2d08f1d5956b332fdc544e5dd':
  Import translations. DO NOT MERGE