am 8ae69302: am 7d690ba9: Merge "Re-enable concurrent system weak sweeping." into klp-dev

* commit '8ae693027ae56ed19dc5f2e81e9a3a4a37988754':
  Re-enable concurrent system weak sweeping.