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

* commit 'c74ef2f28b1b095ecb3dea78ff8d277daec84f58':