Merge "Update strings based on UX/product feedback" into udc-dev