Merge changes from topic 'lshal_debug' into oc-dev
am: 47c1875e35  -s ours

Change-Id: I66ecb116b5f601b08982ca82ab8aeda7e2c8a22e