Merge "Fix a bug in the USAP Pool refill logic."