Merge remote-tracking branch '36368/ihor-sviziev-patch-1' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php

@@ -6,8 +6,9 @@
 
 namespace Magento\GiftMessage\Block\Cart;
 
-use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Json\Encoder;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
 use Magento\GiftMessage\Model\CompositeConfigProvider;
 
 /**
@@ -16,7 +17,7 @@
  * @api
  * @since 100.0.2
  */
-class GiftOptions extends \Magento\Backend\Block\Template
+class GiftOptions extends Template
 {
     /**
      * @var bool

app/code/Magento/GiftMessage/Block/Cart/Item/Renderer/Actions/GiftOptions.php

@@ -5,9 +5,9 @@
  */
 namespace Magento\GiftMessage\Block\Cart\Item\Renderer\Actions;
 
-use Magento\Backend\Block\Template\Context;
 use Magento\Checkout\Block\Cart\Item\Renderer\Actions\Generic;
 use Magento\Framework\Json\Encoder;
+use Magento\Framework\View\Element\Template\Context;
 
 /**
  * @api