Changes and deletions in TRDS

Change-Id: I11bb8600dc172027aad1bb002ae31aa4804a0997