Merge "Override old alarms in zen schedule"