Another TRDS fix

Change-Id: Ifc74e51c80bfc05469bf16e0d6d1a9f3db18f059