am 892e65cb: am 0dab4dc0: Fix bad alarm delivery
automerge: 7c1f995

* commit '7c1f995b7bf171a1b556dcaa4dc16cf46db853be':
  Fix bad alarm delivery