Merge "Handle setting and deprecating local DNS IPv6 addresses" into nyc-mr1-dev