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

* commit '7fbc5ae88515362f41ff382d8e614e1225787183':
  Import translations. DO NOT MERGE