Merge "Revert "Add git submodule for openretriever""