am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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