am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into...
am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb99 automerge: 513f2602
* commit '96171f08':
Zen: Create a new exit condition for "next alarm".