am f90ca4ba: am fa09d442: Merge "Fix CC root visiting bug"

* commit 'f90ca4ba1f832ef0f04ef61a8e3923a32c8021bf':
  Fix CC root visiting bug