Merge "Use IPv[46]_BITS instead of IPV[46]_MAX_PREFIXLEN"