am 0526f5af: Merge "Some fixes for the CC collector."

* commit '0526f5af91cc6b986e0b439577de0b93f9e5354c':
  Some fixes for the CC collector.