am f436a16b: am 50122db5: Correct double-convert from uid to userid

* commit 'f436a16b645b30716cab2227bb4029d64acffaf3':