am d5c0587b: Merge "Cleanup thread pool tasks creation."

* commit 'd5c0587bc26a820646950b634275ba10ab06c995':
  Cleanup thread pool tasks creation.