Merge "Correct double-convert from uid to userid"