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

Change-Id: Id8f5b24bdf8fc141f42a2fb357767b45138591e4