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

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