Attempting to import a ProtoBuf definition which uses imports fails with:

Caused by: com.google.protobuf.Descriptors$DescriptorValidationException: AeiReaderMessage_M.proto: Dependencies passed to FileDescriptor.buildFrom() don't match those listed in the FileDescriptorProto.
at com.google.protobuf.Descriptors$FileDescriptor.buildFrom(Descriptors.java:240)
at org.infinispan.protostream.impl.SerializationContextImpl.registerProtofile(SerializationContextImpl.java:61)
at org.infinispan.query.remote.ProtobufMetadataManager$ProtobufMetadataRegistryListener.registerProtofile(ProtobufMetadataManager.java:154)
at org.infinispan.query.remote.ProtobufMetadataManager$ProtobufMetadataRegistryListener.modified(ProtobufMetadataManager.java:149)

This is caused by the fact that SerializationContextImpl#resolveDeps returns an empty array even though the inlcuded file is actually in the definition.