Merge change Ic5176ecb

* changes:
  Remove deadlock-prone thread pool.