Track own Trebuchet

Change-Id: I7986abaa96865d3a4cb4c861b66204b45cb9a042