Merge "Clean up SystemServiceRegistry."