Merge "Fix bug in fs_mgr with calling vdc"