Additional logging for debug

Change-Id: I9dbb8ffb33546747c4b67d849974e0a03398a6e8