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

Change-Id: I42188f1f7f771f1988f0bb039e8afee1574ebb02