TRDS Buld Fixes

Change-Id: Ibdae9e927a8d078a89bfeecdd1ea3958481c0bc1