Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev am: 6d6ddf45 am: 424731e0 am: 108015c9 am: a558c35a Change-Id: I5cca250a5e4cca1790e545d4a368e133adef927f