Merge "[automerger skipped] Fix for heap buffer overflow issue flagged by...

Merge "[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 28dfceb4 -s ours am: 2829a2ac -s ours am: 41bf0e0d -s ours am: 0a18b772 -s ours am: 5c8230bd -s ours am: 4408de4c -s ours am: 322bebee -s ours" into main