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

* commit 'feb72fef599b23d6f7b0d7c3d0fe7a04edde1963':
  Correct double-convert from uid to userid