Merge "filerepo: Mark some internal LocalFile methods private"