Merge "Fix failing threadpool_auto_increment test."