[automerger skipped] [automerger] Fix possible OOB read in...

[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am: d5228d74 am: fa74823b am: b361611d am: 3ba6528f skipped: 86ec9542 am: 88268c3a  -s ours am: fe07f172  -s ours am: b46d9c0b  -s ours am: a534fe0d  -s ours
am: db0240c6  -s ours

Change-Id: I346ad07d13464fc45cbcc04001d5b14f5eb86d8c