Merge "Add more test coverage for DnsOptions."