Merge "Revert "Revert CC related changes.""
am: 07ab8831ff

Change-Id: Ibd61ac9cbce9269f084a60eed6b2f71a74c8320f