am 4ec56764: (-s ours) am 5b2a59d8: am 9885af05: am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '4ec5676466f0e5a52902919aaf363728bab95f93':
  Import translations. DO NOT MERGE