Merge "Fix subnet to use dhcp not preload"