Convert to new TRDS 3.0

Change-Id: I68db4cc0ad93aba71f695d43a59252d8f04b9865