Merge "init: fix crash when reboot is triggered by a builtin" am: b92415cee2 am: 171587d10e
am: e50fd398ef

Change-Id: I5b8cb44b4d93049d844738468f8755dce4916e86