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

Change-Id: I64b304fe579100b097973ef443539d25e91c41ef