Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev am: 1b72661e45
am: a2ead90f44

Change-Id: I41947cb05866cc6634100978eba158d76e666538