Remove use of InstanceIdentifier.builder(InstanceIdentifier)