Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev