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

* commit '062feaf39594df4b09fc6e1b005bb72b334f3c79':
  Import translations. DO NOT MERGE