Merge "DHCP Handling for TOR VM"