Merge "Add a null check to hasIPv4AddressOnInterface."