Merge "Base date-change alarm on 24h "hour zero," not 12h" into nyc-mr1-dev am: 262f0186bd
am: dd1d9baa55

Change-Id: I69200ed34995f3ce1c1a90d18912953b525cca62