Merge "Zen: Track next-alarm condition across reboots." into lmp-mr1-dev