am 23523662: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '2352366238143a07597a95715bb1feee5449e2f2':
  Import translations. DO NOT MERGE