Merge "Update the uid correctly."