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

Merge "[automerger skipped] Merge "Fix for heap buffer overflow issue flagged by fuzzer test." into rvc-qpr-dev am: 8ff3cc14 am: a157f7f2 am: 74a49268 -s ours am: a9fab0b8 -s ours am: 5c99143d -s ours am: bf84abb4 -s ours am: 0c29c13a -s ours am: 0a5929dd -s ours" into udc-d1-dev-plus-aosp