am df0c7e76: (-s ours) am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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