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

* commit '7d690ba929a2a02e2b6344749561d49e2c0d55d2':
  Re-enable concurrent system weak sweeping.