Merge "Keep fs_mgr_vendor_overlay_test in internal cf." into main