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

Change-Id: I5182e8474d0ed481485b58d1a6a0c447859ea5dd