Merge "init: Allow clean system shutdown upon SIGTERM" am: 61cb88add2 am: 721b2d6035 am: 69596c2d00
am: 056283e86e

Change-Id: I8bce9edf5898e9cbbe28f6f1bd71e9428d317262