Merge "Remote submix: replace include path with module dependency"