Merge "Fix gcstress tests."