Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58
  Import translations. DO NOT MERGE