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

Change-Id: I98b62ef9f9d13501b981e8ffbf5f82196c3136ee