Fixes for TRDS switch and missing files for TRDS.

Change-Id: I257628c55a73a91be6ea178e483096f35659c73a