am db39d382: am feb72fef: am 05e449a0: Merge "Correct double-convert from uid to userid"

* commit 'db39d382728eb126a12fce93c01fed25cbc217e4':