Track own Terminal

Change-Id: Icc47019405baa2e25d7595b18f13d9f93be9a446