Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev am: 6d6ddf4502

Change-Id: I0b12e66a76ad6f9ebdcaf21c8ab920804411277d