Merge "Revert "init: Reboot after timeout passes during reboot"" into pi-dev
am: 16e2e9d4da  -s ours

Change-Id: I94fcdb89740b51a598881467cee2eabb03e9986f