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

Change-Id: I4663a64806ddb285e8bf5e9235759fee49bc8a93