TRDS 3.0 Build Fixes

Change-Id: I443b6a0d68e4f0f84a5bd7c9eeb01b659b052786