Merge changes from topic "am-95f8f6c267dc43c78a9ad7baf220f8ea" 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: 41f63070 -s ours am: ac9c7f30 -s ours am: 798be931 -s ours am: 41f52be2 -s ours am: aaac7e6f -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: f476efbc -s ours am: d38a1732 -s ours am: ca7d8fb6 -s ours am: 6149802f -s ours am: d0275d28 -s ours