TRDS 3.0

Change-Id: I21040f766a0aab6f9bc7a3510b7d3ca10f39e665