[v9_16] Resolve "ADB quota might not be decremented"

Backport of !6893 (merged).

FTR: note that only one of three issues fixed by !6893 (merged) exists in v9_16, so this is a partial backport.

Closes #3598 (closed)