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: 9b2183ae -s ours am: b3273191 -s ours am: 9bc243d1 -s ours am: 2911ef2b -s ours am: 47753ee2 -s ours am: 5c28d700 -s ours am: 6c78c5da -s ours am: f894603e -s ours am: e590de4b -s ours" into udc-qpr-dev-plus-aosp