Merge "Maintain ordering when alarm removal alters batch bounds"