am 414fec25: (-s ours) am 909b6db6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '414fec25225acc5b6fc40c1ce92a84ae95b3fce2':
  Import translations. DO NOT MERGE