Merge "Add missing IntDef INTERNAL_ERROR_MISSING_USER" into main