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

Change-Id: I43dd4e8b58c27755dd2737732b1af92423747278