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

Change-Id: I6495dd26ac30e1e07bdb9da9a933faee97b63155