for review nursery, and updating categorical constnat issue
Reviewer: Dan Jao & Chezka Arevalo (post-commit)
Issue : GCP-9658