Add check variables in TermId

GCP-9879

Reviewer: Aldrin Batac
Merge branch 'master' into branch_tests_swarm