TRDS general fixes

Change-Id: Ibee647b2081b46cb2989222ff0cd2cac000ced93