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

* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE