Merge "TrustManagerServiceTest: Fix broken tests" into main