Fixes the issue with removing variable and the data table is having issue

Reviewer: Chika Arevalo (post commit)

Issue: GCP-9403