[automerger skipped] [automerger] DO NOT MERGE Add bound check for...

[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am: 20a4f370 am: 7bab4f03 am: cff131e0 am: f6e90a50 skipped: 4c6f0dc7 am: e33b04f9  -s ours am: 73b174b1  -s ours am: f84251c4  -s ours am: eb2f2965  -s ours
am: 25244853  -s ours

Change-Id: I67848ac9d93112b80efa232f799ec83ec721c0ef