am d3ae5934: am 35586c6f: Merge "Some clean up for mark sweep files"

* commit 'd3ae5934c320e24f81f8f159fb7f989234223ec1':
  Some clean up for mark sweep files