Merge "add debug logs" into oc-dev am: 7fa473b1aa
am: 6f590d0913

Change-Id: I55f42ea0f15d271af80192a3e48cc6e20c4a9f75