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

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