Track some CM stuff

Change-Id: I5e9c9394acac7d53af932cea2df9784153a3f7c4
Signed-off-by: Evan Anderson <evan1124@gmail.com>