Some fixes in TRDS implementation
Change-Id: I3fa9aafa98a066dfd56e4ea892cfc2880df3fb84