Merge "Remove infra repo from submodules"