Adjustments to TRDS

Change-Id: I60c7b440ee7aa11a0af8979464757bc2af447078