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: 6d21e159 -s ours am: c89b12b9 -s ours am: 6d04562b -s ours am: 64d9a91b -s ours am: f575f70e -s ours" into udc-qpr-dev-plus-aosp