Track CM system/extras

Change-Id: I9f5ef6fb3d817907d26da8becc173162e2067b12