Merge "[automerger skipped] Fix Segv on unknown address error flagged by...

Merge "[automerger skipped] Fix Segv on unknown address error flagged by fuzzer test. am: c138d206 -s ours am: d8a8bfd0 -s ours am: 1269ac72 -s ours am: 218cac0d -s ours am: 411ca070 -s ours am: ffd33b1d -s ours am: 251b5128 -s ours am: 2bb009c2 -s ours" into udc-qpr-dev-plus-aosp