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

Change-Id: I31b6064ae5625a1f6cd1b34c57085a18d870be27