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

Change-Id: Iee1ed69c8b248c6594d721763c9ec466b1a49e1c