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

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