am 26a302b2: Merge "Change GC ergonomics to better handle heap verification."

* commit '26a302b2bb07d754b958a4013116946fbbd78c62':
  Change GC ergonomics to better handle heap verification.