am 5be9e1cd: am 60adb5fa: Merge "Qualify IPv6 link-local DNS servers with an interface name" into mnc-dev

* commit '5be9e1cd1b8f38c629ecdc959c10dc6e9df2d3c4':
  Qualify IPv6 link-local DNS servers with an interface name