am daafbe94: Merge "Minimize chance of race condition bug that misses alarms...
am daafbe94: Merge "Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms." into ics-ub-calendar-aqua
* commit 'daafbe94':
Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms.