Merge "Cleanup fs_getline from fs_mgr"