Merge "Revert CC related changes."
am: 9ebca690fd

Change-Id: I56445fbe00521ea7c47432d1b56f0955de804e41