Merge "Correctly reschedule alarms on system time change."