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

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