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

Change-Id: Ib446e6cf826e72e921e558ca34a31f74a9cdc063