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

Change-Id: Id746ddf6ca8113d2d67867869799eed55a7b2295