Merge "fs_mgr: Remove early prototype code."