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

Change-Id: I6c39ead6fa08d457a0e33ca913d072f1026391cc