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

Change-Id: I1b1cbb8c432bcbbbf7713144044831bcb09e4528