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

Change-Id: Ie7f3af47145cfd581a8484a8c397518c01cdda40