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

Change-Id: I903a58aeb9f2656ebcaf7d0fbadc1f41f813a5ce