reduce kill time

Change-Id: Ib3b662ffd42f5ec02d1c4032c3d8105d2e650a50