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

Change-Id: Ida508af83327563e39cda89410258925819381d8