Reviewed-by: michaelm, rriggs

Summary: delegate InetAddress fields to a holder object
Reviewed-by: alanb, chegar

Reviewed-by: darcy, weijun