Merge "2 tests sometimes timing out on gcstress/debug."