Merge "[FileRepo] Various code cleanups."