[automerger skipped] Prevent Out of bounds read in llcp code part 2 am: fffa48776b am: 39f733ce00
am: 3aec4196b2  -s ours

Change-Id: If2eff32af0ab87402dff4e2baa8d6ff54df4f838