Merge "Removing legacy alarm batching algorithm"