CFX constants for my cherry-picks

Change-Id: Ie4683733c5d3bb69021dd0b683c40dee5f86b6ff