track our own torch

Change-Id: Id3ea360e66c06a07c8adba648aef25790ed5dcf1