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

Change-Id: Ie5619ada8c486b0174a69fa0785605f3f495ee1f