Merge "Fix confusion of userId vs. uid"