Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
  [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
  Import translations. DO NOT MERGE