am fa365d2f: Merge "Fix memory usage regression and clean up collector changing code."

* commit 'fa365d2fa097810f31d6cb1b1ef415636bc63af8':
  Fix memory usage regression and clean up collector changing code.