am 09256980: am c74ef2f2: am 7d6a0f9c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '09256980960cd5de7633f3a0f69cef2a676a6812':
This commit is contained in: