Fix some Derps related with TRDS implementation

Change-Id: Ib7af54ba70b8c010110a101c86b39ea139a07153