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

Change-Id: I2d4e8a4230c555dafdb4ce437ae22c1f2a9c2d83