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

* commit '125579caa1b4fb2de4242b0af3f4749bac9fa699':
  Fix bugs regarding delay the dispatching of non-wakeup alarms