Merge "Correct buffer size limitation for DnsResolver API"