Merge "Do not -1 for lshal." am: 50752b732e am: bd4cc238fb am: 44a6d5a5eb
am: 035fa3eb6b

Change-Id: I0547c8b71e2709c19f30db457d881ee7d2986cc7