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

* commit 'cdf5ecc8c5fb754406206a78417c5a3b34c485b3':
  Import translations. DO NOT MERGE