Merge "Updated UDFPS strings." into tm-dev