[automerger skipped] Adjusts the USAP pool refill mechanism. am: 0b2fbfcf -s...
[automerger skipped] Adjusts the USAP pool refill mechanism. am: 0b2fbfcf -s ours am: 1e60d390 -s ours am: 4fa7b27a -s ours
am skip reason: Change-Id I7328f304c9b744cfdbfbdbe522a5f9aeea5233bb with SHA-1 11950829 is in history
Change-Id: I2bcc8f6e5ef46d756729caa5eb1001579880d1cb