Merge "send SIGTERM only once" am: 9ead7c4a74 am: ba54f32b0a am: 72d44ae00c
am: 1bcca04d6b

Change-Id: I4dcc796986e060200ba4981d31b1490aa7766b1a