Merge "TextClassifier: Multiple entities & confidence scores."