am f315b6d5: (-s ours) am def10485: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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