Merge changes from topic "am-646f2b08-34bd-411a-990e-eb87fb67f9e3" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823 am: 2b4a5926e3 am: 1fac9d6472 am: 358e526ac9 skipped: 348076fa17
  [automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823 am: 2b4a5926e3 am: 1fac9d6472 am: 358e526ac9
  [automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823 am: 2b4a5926e3 am: 1fac9d6472
  [automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823 am: 2b4a5926e3
  [automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823
  RESTRICT AUTOMERGE: Fix heap buffer overflow