TRDS 2.0

use propper configuration values now

rebase

Change-Id: I181191d5b92f52f2df0f07ef12957ec5aee02507