Merge "Revert "init: Reboot after timeout passes during reboot""