Merge "Removing NUM_ prefix from constant names."