Merge changes from topic "lshal_stuck" am: c37c7ae016 am: 228dd2a71c
am: 26604b7676

Change-Id: I82fce184b4f07f64bd2fa7378036f5bf9ac66871