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

Change-Id: Id15799972ddead9152ac4f8bd9f1ddc071f16f89