Merge "Drop OfficialClientManager from tenant isolation"