am 1aaef016: am b0579834: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '1aaef016fade071b7bd61763bf4ffb5a2b853713':
  Import translations. DO NOT MERGE