Merge changes from topic 'lshal_debug' am: d4f5bb4c17 am: a7f366d411
am: cb0cb2f04e

Change-Id: Ia931ccf63b5a7c6d05616c1137fe90e45dc4d612