Merge "lshal: fix potential out-of-range error." am: cb82bdbf10
am: 7cd89ffb8b

Change-Id: I748f698a3ff99cbc7a9c128c0966404d0377bd9c