Merge "fs_mgr fix flags/fs_mgr_flags mismatch"