Merge "[automerger skipped] Fix for heap buffer overflow issue flagged by...

Merge "[automerger skipped] Fix for heap buffer overflow issue flagged by fuzzer test. am: 1401a723 -s ours am: 3326d979 -s ours am: 81443cd4 -s ours am: 21ef0e24 -s ours am: 324a56c2 -s ours am: 60bdda85 -s ours am: 928572d2 -s ours am: 0a7a23cd -s ours am: fb9f9969 -s ours" into udc-d1-dev-plus-aosp