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

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