Merge "Adjusts the USAP pool refill mechanism." into qt-dev
am: 40654b7696

Change-Id: I998f2b95043cfc26a8ff0e35d9462e48e2d6dd06