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

Change-Id: Ibfd78b0381d3f4cccaae90af1334d21d2fe594d2