am 125579ca: am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"
automerge: 75070f2

* commit '75070f2f18bbbaa8065000684da64359d8545de9':
  Fix bugs regarding delay the dispatching of non-wakeup alarms