Clean up some logging to make it more useful to debug.

Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
2 files changed