[automerger skipped] Adjusts the USAP pool refill mechanism.
am: 0b2fbfcf6f -s ours
am skip reason: change_id I7328f304c9b744cfdbfbdbe522a5f9aeea5233bb with SHA1 119508293b is in history

Change-Id: I3b5dc52dc83ab8d81e0daaafd7a76a1b923180c1