Merge "Make sure freeaddrinfo is always called on failure." am: f914029057 am: 9e1173aa40 am: 84cd98ceb0 am: 78bc132d32
am: 38b8951708

Change-Id: I62482fd31aa8373801c6d15d970e864274b3cdf7