Merge "Delete unused default DNS setting code" into nyc-dev