Remove validation that limited address pairs to v4 Change-Id: I78ce297d5838d6d4aec1e1c4abf1f67486ffddc4