Merge "Fix auto allocate network cleanup"