Converting to new TRDS 3.0

Change-Id: Ic29cab1abf62c4d00cc33ae12e9ada1bf1b47bc7