Fixes in TRDS implementation

Change-Id: I57896bab9a18d711a689d03c82d8ea06d1739cad