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

Change-Id: I4513f30cd7c88d525d4ba263997bb52f3c14cdde