Merge changes from topic "am-33d1839e98ec434ca3a6bca757e7cd10" into main

* changes:
  [automerger skipped] Merge "Fix heap-use-after-free issue flagged by fuzzer test." into sc-qpr1-dev am: 5c3d1d4c -s ours am: c22d0024 -s ours am: 300b18a3 -s ours am: eb075b66 -s ours am: 1e1e3c5c -s ours am: b0da8082 -s ours am: 26f772f2 -s ours am: 0f9ccd29 -s ours am: b1a3fcee -s ours
  [automerger skipped] Fix heap-use-after-free issue flagged by fuzzer test. am: 7ff382cb -s ours am: da3d2474 -s ours am: 69e86ab4 -s ours am: 9fae6d92 -s ours am: 7c0197ef -s ours am: 2d48dd48 -s ours am: 89532dcb -s ours am: 7f55fe09 -s ours am: 107c17d8 -s ours