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

Change-Id: I2cb0588df3a90929535019c88ad9b9b71a70d763