Merge "Correct buffer size limitation for DnsResolver API"
am: 26a0272b00

Change-Id: Ia9febf5f707c182d465e79ed8f4d80a4853c868f