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

Change-Id: I000070eca639e129efe50249ecc16a28cfadc6d3