Merge "lshal: Fix timeout causes unexpected exits."