Merge "Fix corresponding .cpp file for the remove const CL."