Merge "Revert "Revert CC related changes.""