TRDS fixes

Change-Id: Ia4e5676e745e1fe3ca8b7d9e4c9af1532a37e5b4