Merge "[FileRepo] Made getDescription() respect *_deleted fields."