am a09d5df5: Merge "Fix gcstress tests"

* commit 'a09d5df5128c5c51226028d4a82ed461cf993024':
  Fix gcstress tests