Merge changes from topic "lshal_improve"
am: 0639471d64

Change-Id: I9a59f890b5c4c0469c49f0a4ef36c38e4256c5a4