Merge "Revert "Optimize service restart logic.""