Merge "Update string based on new mocks" into udc-dev