Merge "Reland "Disallow shrinking threadpool size once started."" am: 0d4dfb1c9b

Change-Id: I93a3cdacf2ef27b41313cdd3e1ac29136c54a861