Merge "Switch from using sockaddr to sockaddr_storage."