Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev