Merge "Revert "Clean up system service registration.""