TRDS Build Fixes

Change-Id: I2d40e2e88813b34807a51801d81987fc7cee4dea