Merge "Disable mDefaultDns to see if we can remove it." into mnc-dev