Missing changes from TRDS commit

Change-Id: Ic1e384d971d5c08c8de3264139d580e2c67396c6