Merge "init: Reboot after timeout passes during reboot"