Merge "Fix a bug where alarms are deduplicated"