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