am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6

* commit '6ccb72e9940df9b50a213fa84483ed5da9780cd0':
  Zen: Add the ability to enter "None" mode during downtime.