Made sure we set the measurement variable is factor attribute to true if its a factor

Reviewer: Tiff Go (post commit)

Issue: GCP-9708