am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3

* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320':
  Zen: Pull next-alarm tracking out into separate helper.