Merge "Remove vendor snapshot tools" into main