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

* commit 'a3a5200529e0c2f4be21d9837249200a8387ad60':