Merge "Remove unnecessary alias for service clients"