Merge pull request #17201 from rohitwaghchaure/fix_test_cases_for_item_variant

Fix: item variant test cases