Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev am: 6d6ddf45 am: 424731e0 am: 0d53e150 Change-Id: I4d8086d3566ee31f6ebfac285fb02fa8f60119e5