Merge "getnameinfo: Don't add flag NI_NUMERICHOST for well-known prefix address" am: 38b82558 am: c869cf9e am: be60e817 Change-Id: I1c39ab3854db8895875ed447e72896fea6460271