am ecb1616c: (-s ours) am e78218b8: Merge "Import translations. DO NOT MERGE" into jb-dev

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