Merge "init: trigger shutdown directly from builtins" am: a5a107fb6d
am: 46fb1a5c23

Change-Id: Ie7285144bdc56190ae63e11e918cff772e327cd5