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

Change-Id: I1e5c9f1a1432ea3105ed22571b97a255eaed6017