TRDS 3.0 Fixes.

Change-Id: Id660ce1501c65a918a240dc35fc4c39c569edcb1