Merge "Revert "init: Reboot after timeout passes during reboot""
am: 92d55b6c07

Change-Id: I14999bf605bd31d5ae10a845c702ffb2161f51f5