TRDS 2.0

Change-Id: Ica8c71c4b1ae38f5323b10a627ddd5000710e6de