Merge "Clean up getService()."