am c282c119: Merge "Fix gcstress tests."

* commit 'c282c119bbbe55562407debcf24e0540bf71de04':
  Fix gcstress tests.