Merge "Change logging in stress test"