am 5c3e277f: Fix bad alarm delivery
automerge: be3206e

* commit 'be3206ecdce7aead184e8939a29ac7dd5f91931e':
  Fix bad alarm delivery