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

Change-Id: I5918986fa44d9decf7a8aa4cfcaf0b1520b1041e