[automerger skipped] Merge "Make the USAP Pool refill delay configurable."...
[automerger skipped] Merge "Make the USAP Pool refill delay configurable." into qt-dev am: e6f11ab8 am: 86d02b6f -s ours
am: 3c749040 -s ours
am skip reason: change_id I244d83a38bde32620bd4bf50e9031c25c6267091 with SHA1 54b8d7ea is in history
Change-Id: Iaf2e5ce9194118dc5eba8a418bba15a398d5be82