Merge \\"Delete one more legacy DHCP client string.\\" into nyc-mr1-dev am: 54b2e7dc0a
am: c3021c90e8

Change-Id: I1c27cd049ee14464f6fc4cff0b66a4561456e879