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

Change-Id: Iadfbc11f8bbfc45759f2214d0811922cbb173758