Merge "lshal: Fix timeout causes unexpected exits." am: 057e74631b
am: fdf61aa557

Change-Id: Ie3f025b610fd8b523b4f03c2c9b5d62b7966f309