Fix issue when adding a variate, generating measurements, deleting the variate then saving

Reviewer: Daniel Jao (post-commit)

Issue: GCP-9847