Merge changes from topic 'lshal_debug'
am: d4f5bb4c17

Change-Id: I0d7b068421152d9c2bfb1c53718abcb7e09c26a1