am e65c292a: (-s ours) am f104f676: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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