track own core

Change-Id: Ia700a7738c24c5f59860ee0b40146f20ee47450f