TRDS Fixes

Change-Id: I8760f4d81e54b7b6b0a80495c8436131f085b8d9