Merge "[FileRepo] Use getHandler() is some places that should use it."