Merge "Revert the AssistAction class." into mnc-dev