Merge "Fix call to configure threadpool." am: cab71a0159 am: 87c3232600
am: 01967b1869

Change-Id: I17aeb78d27628a04901cc7069826e711d00282b4