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

Change-Id: Ia504b3e79cc27945c8a544dc0881e7d9918fd65c