Merge "fs_mgr: string literal cleanup"