Merge "Override old alarms in zen schedule" into pi-dev