Add debug logging

Change-Id: I68ef9b4c24a4f62681b005e9c39401cd2f7ffb3c
Merge "Add debug logging"