am af84a575: GC channel fixes for better interop with SCC

* commit 'af84a575044f6556994fcc124a955fc0ac0a6736':
  GC channel fixes for better interop with SCC