Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev am: 6d6ddf45 am: 06d9593c am: b11568c0 am: ba6d052a Change-Id: Id493b9029dc73d4de1e99f849d95edfef4fae384