Merge "Switch to new project ID constants."