Merge changes from topic "am-310418a8696a406d860018e40222ecf1" into udc-qpr-dev-plus-aosp

* changes:
  [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
  [automerger skipped] Fix Segv on unknown address error flagged by fuzzer test. am: 5825299c -s ours am: 8c1d227a -s ours am: f349de64 -s ours am: 6f568975 -s ours am: 65846cdc -s ours am: 0f613c36 -s ours am: 49954c17 -s ours