bhagwat070919: Automated cherry pick of #84265: Fixes unnecessary creation of default SG and trying to delete

No Results