Cherry pick commit that was dropped in 30033 (FlavorTagDiscriminants)
In !30033 (merged) I dropped one commit because the m_* prefixing campaign created a merge conflict. This fixes the conflict and adds that commit.
In !30033 (merged) I dropped one commit because the m_* prefixing campaign created a merge conflict. This fixes the conflict and adds that commit.