Merge "Make MigrateFileRepoLayout use getErrors()"