Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am: e1451c4e30

Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481