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

Change-Id: Ib13d0285f00b224cffdc4b23552d0196c0c0f697