Merge "Clean up logging code."
am: 17a02a33bb

Change-Id: I23be231fd1145912c8a35c221656844bf47abc79