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

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