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

* commit 'cf961531c2dc7bb57d04d4f2f51ec5bfe6b06d6a':