Merge "Implement more features to vendor snapshot script"