Merge "Add skip if public_network_id is not specified"