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

Change-Id: I05e1a63fbfbe3c2348cc70f8a98bc6fad90ee5e2