Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2
  Import translations. DO NOT MERGE