Merge "Small fixes for TextClassifierImpl"