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

Change-Id: Icfd5998fd5a6cc558cc26addf0e89ccd0b61bb5f