Merge branch 'BUGS' of https://github.corp.magento.com/magento-south/magento2ce into BUGS

Author: Oleksandr Karpenko

app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

@@ -98,7 +98,7 @@ public function __construct(
         ManagerInterface $messageManager,
         Escaper $escaper,
         AppState $appState,
-        CustomerSession $customerSession = null
+        CustomerSession $customerSession
     ) {
         $this->_customerVat = $customerVat;
         $this->_customerAddress = $customerAddress;
@@ -109,9 +109,6 @@ public function __construct(
         $this->escaper = $escaper;
         $this->appState = $appState;
         $this->customerSession = $customerSession;
-        if ($this->customerSession === null) {
-            $this->customerSession = \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerSession::class);
-        }
     }
 
     /**

app/code/Magento/Customer/etc/di.xml

@@ -307,9 +307,4 @@
     <type name="Magento\Customer\Api\CustomerRepositoryInterface">
         <plugin name="transactionWrapper" type="Magento\Customer\Model\Plugin\CustomerRepository\TransactionWrapper" sortOrder="-1"/>
     </type>
-    <type name="Magento\Customer\Observer\AfterAddressSaveObserver">
-        <arguments>
-            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session</argument>
-        </arguments>
-    </type>
 </config>