Merge "Add IpConversionUtil.hasIpv4Prefix()"