Merge "remove emergency shutdown and improve init's reboot logic"