am 977d409b: Merge "Refactor sweeping logic into malloc space."

* commit '977d409b959497eecc44a35cff16115d0f04ccab':
  Refactor sweeping logic into malloc space.