Merge "Update CTS for ConversationActions"