am a0bee9f0: (-s ours) am 2028f8e0: am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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