Merge "Mock SubscriptionManager in CSTest" into main