Merge "Update CDM strings per UX review" into sc-dev