am 8ce25752: (-s ours) am defe7615: am aaf3fbc6: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '8ce25752f78245c513a055378804f1e16f71d831':
  Import translations. DO NOT MERGE