Convert to TRDS 3.0 system

Change-Id: Id9ed8063e3a94043316254c335eebb215cc13e5d