Merge "Remove service_client module"