Merge "Clean up tracking new roots, do not track them for CC."
am: b4aeefe88f

Change-Id: I1727fa5411001f13bd8f4b6557becbc1ec94b53c