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

* commit '94ca800055d90c35f29263157bc901c73f4fde32':