Track some more stuff from CM

Change-Id: I947cf072f25aef515231e900b55146b224f4d997
Signed-off-by: iceandfire <arhamjamal@gmail.com>