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

Change-Id: I0bba457256f44597d76c12a2bee132e083cecbb3