Track our system/core

Change-Id: Ia4da39bfd55bdfd3f17d44decf36605250d1961f