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

Change-Id: Icedde2b74840e39afeb62db37310c45031d0a543