[Build] Fix issue for Zip and clean samples, nightly builds