Merge changes from topic "am-df35ccef4bd34d53ba43ce9e60645aa7" into main

* changes:
  Merge changes from topic "am-310418a8696a406d860018e40222ecf1" into udc-qpr-dev-plus-aosp am: b7d7d4bb -s ours
  [automerger skipped] Merge "Fix Segv on unknown address error flagged by fuzzer test." into sc-v2-dev am: c67aa915 -s ours am: 9b9bc75c -s ours am: dce42668 -s ours am: 9c1495d4 -s ours am: 39056ff9 -s ours am: 9e2d6a7b -s ours am: 8ac65373 -s ours am: b80e769d -s ours