Merge "Use InputProcessor instead of InputClassifier"