Merge "add kill all for shutdown_timeout of 0"
am: dd26e1a28c

Change-Id: Icea19092ec3743f045cb650d2810cc635bb58908