am 0e8d9cf1: Merge "Make tests more reliable by cleaning up worker threads on cancelation. b/17888343" into lmp-dev

* commit '0e8d9cf18bcc2317785bf74d2e2bacb107f7d5e1':
  Make tests more reliable by cleaning up worker threads on cancelation. b/17888343