Track system/extras from Slim

Change-Id: Ib66e07d5d2faf1cc1c0e6c42b278fec881666758