[automerger skipped] Improved timekeeping logic for USAP Pool refill mechanism. am: d8ef116993 am: c57c1c3356 am: 619fb8050b -s ours
am skip reason: Change-Id Ic6f65de51757803b5ba95975bab3b9322a91c837 with SHA-1 2f37bb1f6a is in history

Change-Id: I5c61385b62d47d2f78cad3b2f6778a61e06389ec