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

* commit '4d0e5e0e152a91ccc63a382a9a8da8d21b16452d':