Merge "Changes to reduce flakiness of TrustTests" into tm-dev