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

* commit 'db60b67533f0e8e0366a926204bc852412285320':