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