am fa09d442: Merge "Fix CC root visiting bug"

* commit 'fa09d442dc74ade81806fce5f1c256f4ddc13004':
  Fix CC root visiting bug