Merge "Revert "Remove FakeDns from NetworkStack tests."" into main