am b8cc0ed8: (-s ours) am 675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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