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

Change-Id: I8e0f285f5b17b11f32b504dda3a4c31da770653f