am 9d41a551: (-s ours) am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '9d41a551e5ceb23afb21db818626a5b377f410a9':
  Import translations. DO NOT MERGE