Merge "Revert "Avoid killing instrumentation process while start process""