Merge "[Multi-user] Convert various calls to use user id"