Merge "Proper deprecate VQDS egress API" into main