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

* commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a':
  Cleanup the shutdown of BatchedScans.