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

* commit '210077c2b5c28c4ae768de3b77c21cb2c3e7cf74':
  Minor improvements for the CC collector.