am bb26acb9: am a09d5df5: Merge "Fix gcstress tests"

* commit 'bb26acb94164e4125d2fc6c17200f8b99f65a075':
  Fix gcstress tests