track system core

Change-Id: Ie0ec6ffaed41d195b52c5ae87b04e238fcd7990c