Merge "Restore DHCP client logging." into nyc-dev