Merge "Remove references to deleted dhcpcd" into nyc-dev