Merge "Gatekeeper: Add missing user_id."