Merge "Fix logging problem for stress test wrappers"