Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into bugfix-GA

Author: Roman Ganin

app/code/Magento/Paypal/Model/ResourceModel/Billing/Agreement/Collection.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Paypal\Model\ResourceModel\Billing\Agreement;
 
-use Magento\Customer\Api\CustomerMetadataInterface;
-
 /**
  * Billing agreements resource collection
  */
@@ -90,4 +88,16 @@ public function addCustomerDetails()
         );
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        if (in_array($field, ['created_at', 'updated_at'], true)) {
+            $field = 'main_table.' . $field;
+        }
+
+        return parent::addFieldToFilter($field, $condition);
+    }
 }