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

Change-Id: Ie1b5dbec81423f28119c36796103c2523e5fa9d5