MAGETWO-33031: Change base data objects and interfaces to be mutable

    - Fixed incorrect type in annotation

Author: Yu Tang

app/code/Magento/Payment/Model/Method/Cc.php

@@ -46,7 +46,7 @@ class Cc extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
-     * @param \Magento\Framework\Api\AttributeDataBuilder $customAttributeFactory
+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList

lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Api\Search;
 
-use Magento\Framework\Api\AttributeDataBuilder;
 use Magento\Framework\Api\Builder;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\MetadataServiceInterface;
@@ -25,7 +24,7 @@ class FilterGroupBuilder extends Builder
     /**
      * @param ObjectFactory $objectFactory
      * @param MetadataServiceInterface $metadataService
-     * @param AttributeValueFactory $attributeValueFactory
+     * @param \Magento\Framework\Api\AttributeValueFactory  $attributeValueFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $objectProcessor
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
      * @param \Magento\Framework\Serialization\DataBuilderFactory $dataBuilderFactory