am 20dcb55c: (-s ours) am 9a646bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '20dcb55cad5b9a37d8e99265266b573d768b8c95':
  Import translations. DO NOT MERGE