Merge "Do not block SIGTERM in init's child processes" am: 176afbbedf
am: 495a672f4c

Change-Id: I0253b1222a1b34fb3c1dae456d53022277d82228