Merge "fs_mgr: use std::string in more places"