Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev...
Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev am: 1b72661e am: a2ead90f
am: 1b3cd7ea
Change-Id: I2f9c699285a89ed4728caf615581bb245ceedbc8