Track Trebuchet again

Change-Id: Ie3576833e07a9f9230db1be4e014d1fc263bdcb6
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>