Merge "Changes to support adding CTS Test TrustTestCases."