Track more stuff from CM

Change-Id: I643a5450eee668837cbb1c2a56c99f2931dc74a3