Merge changes from topic "lshal_improve" am: 0639471d64 am: 3d76135f94
am: e460f4122f

Change-Id: I4664c200219057cf20d24c60b1a138ee1a3a1c8b