Merge "Update TextAssistant interface."