Merge "Remove FileRepoStatus references"