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

* commit '52e5f2e5ec20cbda0f1ea05ae2294acb25950f44':
  The legacy DHCP client is gone. Delete the settings.

Change-Id: I18f88810d4569ea79dd19a2a06f75caa177b557c