Used the TermId constants for the row and col no

Reviewer: Tiff Go (post commit)

Issue: GCP-9525