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

Change-Id: I87003ffa35babf38efd9f207809004422504d1ea