Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637
  [automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0
  Import translations. DO NOT MERGE