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

Change-Id: I315218a2cfb6af694ffdbf35b8997bd60ce01864