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

Merge "[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into tm-dev am: c6acd02d am: 191a53a6 -s ours am: 5fd39707 -s ours am: 8f79d16a -s ours am: f1ce1857 -s ours am: 0ec35d4e -s ours am: d1653f24 -s ours" into main