B-50264 flaky dist ds shutdown
Merge pull request #563 from CoderLisa/fixit

B-50264 flaky dist ds shutdown