am aa368a44: Merge "Refactor large object sweeping."

* commit 'aa368a44da1807a04fd66f348f7f867ca30ce3cf':
  Refactor large object sweeping.