Merge "Use effectiveUserId for credentials"