Comment-out the log setup code due to test failures
Merge "Comment-out the log setup code due to test failures"