track some more CM

Change-Id: Ib5f4c0b4b04df38b2d4b735b597e025b0d02187c