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