Merge "remove precondition-lshal for consistency" into pi-dev
am: 227ce72ab7

Change-Id: I7f343778cf82e87f1bb5cd9a6f2563f56a6e8beb