Merge "Fix modules.dep breakage with multiple module dependencies"