Send SIGTERM before resorting to SIGKILL for timeouts

Change-Id: I0f350f8db3d6e75287d857a1a85bfa1897045326