Merge "Fix call to configure threadpool."
am: cab71a0159

Change-Id: I8eb82ab4e2252b9e9193bad0534e43327696996e