Bring log change back in

Revert "Revert "Cleanup Logs""

This reverts commit a3f990ee76828d01e1e2812c4446221a1c523aa4.

Bug: 11149133
Change-Id: I3fabb4e508cf9063e056979c8ed807ebf372fa4a
19 files changed