am e4a2c2e3: (-s ours) am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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