Patches avoids calling Product from Description and adds "Vendor" as an additional fallback (better vendor than nothing, no?) BUG:317952 REVIEW:111803 (cherry picked from commit 8ff75b92)