Merge "Revert "Enable VVP for daily deployment tests""