Merge "Make init handle reboots"