Merge "Fix valgrind issue with thread_pool_test."
am: 80fdea404b

Change-Id: I8ba8fc9d9dd76324dfc59661d07771c03daa2023