Merge changes from topic "lshal_stuck"
am: c37c7ae016

Change-Id: I21e171e289a96e4aef02a49098301f2747e2f875