Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev
am: b7bf4fa27a

Change-Id: I4702653db00fbcc211ac912c9570baa6c6d8408f