Merge "TextClassificationManager: Make certain methods thread-safe"