Clean-up debug logs

Fix: 336660988
Test: presubmit
Flag: TEST_ONLY
Change-Id: Ie66a34134881e4333f610d8979b2ac443d54a1cb
3 files changed