Merge "Revert "Enable CCPR in Ganesh""