Cleanup debugging.

Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
8 files changed