Merge "Fix bug when generating the textclassifier intent."