am e38e6d67: (-s ours) am 2ceb05a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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