Merge "Fix use of reachable DNS server logic" into mnc-dev