Merge "init: Allow clean system shutdown upon SIGTERM" am: 61cb88add2
am: 721b2d6035

Change-Id: Id420e18f64e3abba6bd50a444ff4f9b05db3dc2d