Merge "Minor improvements for the CC collector."
am: 4bbe7807f3

* commit '4bbe7807f313bb8e59131812c31bf31513094f8f':
  Minor improvements for the CC collector.