Merge "Fix valgrind issue with thread_pool_test."
am: ab07cbe238

Change-Id: Ia415fcd73aa4533af33273f71bb8c8fa8827ffcc