am 15bbb7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp

* commit '15bbb7b731bbb185836f5ac47242682ddd95d885':
  Import translations. DO NOT MERGE