Reboot and Recovery Options

Change-Id: I703c13aed9f198ae42a2639ec86aaa6f968b1cd9