am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '65301b1443804099de1e5165d98a0506682df5cb':
  Import translations. DO NOT MERGE