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

Change-Id: Ic82a1715c7bd31b149a326f6fc56818879e76f1a