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

* commit '9c62720388d2ba9f2b0574726e9556a7000182b0':
  Minor improvements for the CC collector.