Zen: Fix recent regression in mode selection after reboot.

Bug:17509473
Change-Id: I761cd90384c490c7ab07fb633133535846701ce6
2 files changed