Merge "Fix check_service_client_function mock_args bug"