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

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