Merge "Minor language changes for enrollment flow." into sc-dev