am 56868fbc: (-s ours) am 0cf836a7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '56868fbcd9b086219c4350ac34b5dfdde127c5b9':
  Import translations. DO NOT MERGE