Merge "Remove wrong and unnecessary check for setDnsForwarders"