Added some debug information for easy tracking of problems.

Change-Id: I798208b2f2629673ddd711a2e60a8b84bda6b430