am e6cc525f: (-s ours) am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'e6cc525f45e6856a1344a5a21ca119748f7bf84f':
  Import translations. DO NOT MERGE