Clean up reboot to recovery

Change-Id: I92f9e531570e82e01248cbb209befb9772e510d8