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

* commit '15685632e0e62651ccfb6bfa2013afe715768126':
  Import translations. DO NOT MERGE