Merge "Fix dgbuilder image runtime dependencies"