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

Change-Id: If779ada4dbc1e67b28067235f5055d7f94692c69