Merge "Change GC method in LogTest" into nyc-dev