Merge "Transit to correct state after alarm is fired" am: f3c432059c
am: 510a2c5aeb

* commit '510a2c5aeb88c5128737593e314e63265bc5d308':
  Transit to correct state after alarm is fired