Merge "init: Reboot after timeout passes during reboot"
am: 89063827b1

Change-Id: I8db8b48e25b086c341787fbde2d4a2c7d922001d