am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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