Merge "[FileRepo] Use resolveToStoragePath() in more places."