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

Change-Id: Icff0f58abca322e6c62ced27a42da4d6337d5ce6