Add more CG_TRACEs for completeness

Change-Id: If502c3f11c034f3c7386754d84d694a7119c0d37