Merge "Decrement alarm count on delivery failures"