Merge changes from topic 'lshal_32'
am: 2eaf6b8eae

Change-Id: Id18cdd5d27d2624c7ae0f7a60b178d5bf1c71c05