am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '178baecf987e3aee0c29edfdf0b9ea5c3de1ec1d':
  Import translations. DO NOT MERGE