am 798c7ad8: Merge "Zen: handle exit conditions across reboots." into lmp-dev

* commit '798c7ad868d1a09578b9b2b53efe90bce2bbad1d':
  Zen: handle exit conditions across reboots.