Merge "init: Add reboot timeout handler"
am: 67231474fe

Change-Id: I233976350653d41b76c1413aa4b6212b4a206a13