am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into klp-dev

* commit '540784f903c8a9e808ef88d14fe5e1227bda4561':
  Cleanup the shutdown of BatchedScans.