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

Change-Id: I57081ec3e93734d8a5340151ae31822b28f85d55