updated the script as per reviewed comments

Author: Manoranjan.Prakash

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml

@@ -44,7 +44,6 @@
         <element name="allowGiftsWrapCheckbox" type="checkbox" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]']" />
         <element name="allowGiftsWrapToggle" type="button" selector="//input[@type='checkbox' and @name='product[use_config_gift_wrapping_available]' and @value='{{var1}}']/../../../..//label[@class='admin__actions-switch-label']" parameterized="true"/>
         <element name="priceForGiftsWrapping" type="input" selector="//input[@name='product[gift_wrapping_price]']"/>
-        <element name="productImgInGrid" type="block" selector="img.admin__control-thumbnail[src*='/large']" />
     </section>
 </sections>
 

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml

@@ -45,7 +45,5 @@
         <element name="productAttributeOptionValue" type="button" selector="//div[@id='narrow-by-list']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="outOfStockProductCategoryPage" type="text" selector="//div[@class='stock unavailable']//span[text()='Out of stock']"/>
         <element name="ListedProductAttributes" type="block" selector="//div[@aria-label='{{vs_attribute}}']//div[@aria-label='{{attribute_name}}']" parameterized="true"/>
-        <element name="uploadedImageLarge" type="text" selector=".products-grid img[src*='/large']"/>
-        <element name="uploadedImageSmallLarge" type="text" selector=".products-grid img[src*='placeholder/small_image.jpg']"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml

@@ -119,8 +119,7 @@
 
         <!-- Go to the category page and see a placeholder image for the second product -->
         <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToCategoryPage"/>
-        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageSmallLarge}}" stepKey="waitForPlaceholder"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.uploadedImageSmallLarge}}" stepKey="seePlaceHolder"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('placeholder/small_image.jpg')}}" stepKey="seePlaceHolder"/>
 
         <!-- Go to the second product edit page -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex2"/>
@@ -151,15 +150,15 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku3">
             <argument name="product" value="$$secondProduct$$"/>
         </actionGroup>
-        <seeElement selector="{{AdminProductGridSection.productImgInGrid}}" stepKey="seeImgInGrid"/>
+        <waitForElementVisible selector="{{AdminProductGridSection.productThumbnailBySrc('/large')}}" stepKey="seeImgInGrid"/>
 
         <!-- Go to the category page and see the uploaded image -->
         <amOnPage url="$$category.custom_attributes[url_key]$$.html" stepKey="goToStorefrontCategoryPage"/>
-        <waitForElementVisible selector="{{StorefrontCategoryMainSection.uploadedImageLarge}}" stepKey="seeUploadedImg"/>
+        <waitForElementVisible selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/large')}}" stepKey="goToCategoryPage2"/>
 
         <!-- Go to the product page and see the uploaded image -->
-        <amOnPage url="$$secondProduct.custom_attributes[url_key]$$.html" stepKey="goToStorefrontProductPage"/>
+        <amOnPage url="$$secondProduct.custom_attributes[url_key]$$.html" stepKey="goToStorefront2"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageToLoad"/>
-        <seeElementInDOM selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imageFile('large')}}" stepKey="seeLarge2"/>
     </test>
 </tests>