Cherry-pick of fix from master branch to update DNS even if network isn't connected at the time