Merge "Add delay between quota check alarms." into rvc-dev