Merge changes from topic 'lshal_32' am: 2eaf6b8eae
am: 407ec93f4a

Change-Id: I222d3eb23b358ff2dda442027eeb3e7944b027d9