am 17aa1d45: am 183cd994: Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev

* commit '17aa1d45a88b14fe6f0283f79c2602d3243335ae':
  Zen: Fix recent regression in mode selection after reboot.