Track system/extras

Change-Id: I1d5ebf8c2fec4a6e015f041d60a380df0d713494