Merge "Delete one more legacy DHCP client string." into nyc-mr1-dev