Track CM's system/media

Change-Id: I43034cf94f8698bab5bc5c5ae7b44d300fcdcd54