am 921f385a: 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 '921f385ad92e46f13a16f3e71365a70bfcfec024':