Add some more CG_TRACEs

Change-Id: I076fd5957cac62f047778e63a1336bd322f90683