Merge "Do not -1 for lshal." am: 50752b732e
am: bd4cc238fb

Change-Id: I1dd676e1d50b68913578890c5d5096a8d81480b9