Merge "Fix links to remove references to submodules"