Merge "Remove UidRange.createForUser() with userId integers"