Merge "Update strings based on new product decisions" into udc-dev