Merge changes from topic "am-f43a4a036d0d43dc8abd67a07a5bfe97" into main

* changes:
  [automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into sc-qpr1-dev am: 8a9b7cb9 -s ours am: d55ca473 -s ours am: 1fa37584 -s ours am: d9b2a8be -s ours am: 17ba75a7 -s ours am: 4f403dab -s ours am: fd957ad8 -s ours am: 31969b38 -s ours am: 1ed1c2ec -s ours
  [automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 569328a9 -s ours am: faa8ee22 -s ours am: e3b366b1 -s ours am: c004ad6a -s ours am: 6555d118 -s ours am: 09434848 -s ours am: aea82f28 -s ours am: 53b1cfda -s ours am: d7fad35d -s ours