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

Change-Id: I095434814781b986798e677cfd3e54af411d20fa