Merge "Fix emulator dns."