Merge "fix vnf_instance_id error"