Fix TRDS again

Change-Id: Ic3509bc83f47ff2703ebbd0e820fce242c1f411d