The latter module supports also IPv6, and its already being used in other parts of the code base. Change-Id: I073d01ccaf6a490cd1f379634ef6f39f9ca8b4c6