Merge "send SIGTERM only once"
am: 9ead7c4a74

Change-Id: I87ac8e4402207719dd6cebb05adc0a3e1c2afbfe