Merge "Modify how to disable logging in unit test."