Merge "Add an extra reboot into bootloader"