Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."