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

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