Merge "The legacy DHCP client is gone. Delete the settings." into nyc-dev am: a4daf16b57
am: c9733b0696

* commit 'c9733b0696087781136ca2d440dfdfa15df196a9':

Change-Id: Ie0a0298f541358cc5c85c40ee5f22ec2a7524fec