Merge "hv: Fix env var used to select protocol"