am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"

* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
  Fix bugs regarding delay the dispatching of non-wakeup alarms