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: 6a1201d6 -s ours am: 83f54f3b -s ours am: 53a5b209 -s ours am: 09e102f1 -s ours am: 9ff94a92 -s ours" into udc-qpr-dev-plus-aosp