Merge "Fix gcstress tests"