Merge "init: make triggering shutdown from vendor_init better"
am: b34291bcb6

Change-Id: I2f08e6abb496d089a7b795c6dff44d5e4391bf15