am 2e9a8304: (-s ours) am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '2e9a8304302ef84191d29fa62e7f3ef00c636043':