Merge "Updated udfps strings" into sc-v2-dev