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

Change-Id: I43a8576a8aabc30f447caa062c3730b2160aec6b